openssh: remove 110-no_ripemd_fix.patch as ripemd is now supported in openssl the...

Signed-off-by: Peter Wagner <[email protected]>
SVN-Revision: 38821

diff --git a/net/openssh/Makefile b/net/openssh/Makefile
index ce1907f889712cb108c14f7dbe82c597cd69cf23..069c3ccf74310ac1f004abd5c7ee2f148bf908c8 100644 (file)
--- a/net/openssh/Makefile
+++ b/net/openssh/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openssh
 PKG_VERSION:=6.4p1
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \

diff --git a/net/openssh/patches/110-no_ripemd_fix.patch b/net/openssh/patches/110-no_ripemd_fix.patch
deleted file mode 100644 (file)
index 37a4303..0000000
--- a/net/openssh/patches/110-no_ripemd_fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/mac.c
-+++ b/mac.c
-@@ -70,8 +70,10 @@ static const struct macalg macs[] = {
- #endif
-       { "hmac-md5",                           SSH_EVP, EVP_md5, 0, 0, 0, 0 },
-       { "hmac-md5-96",                        SSH_EVP, EVP_md5, 96, 0, 0, 0 },
-+#ifndef OPENSSL_NO_RIPEMD
-       { "hmac-ripemd160",                     SSH_EVP, EVP_ripemd160, 0, 0, 0, 0 },
-       { "[email protected]",         SSH_EVP, EVP_ripemd160, 0, 0, 0, 0 },
-+#endif
-       { "[email protected]",                SSH_UMAC, NULL, 0, 128, 64, 0 },
-       { "[email protected]",               SSH_UMAC128, NULL, 0, 128, 128, 0 },
- 
-@@ -84,7 +86,9 @@ static const struct macalg macs[] = {
- #endif
-       { "[email protected]",           SSH_EVP, EVP_md5, 0, 0, 0, 1 },
-       { "[email protected]",        SSH_EVP, EVP_md5, 96, 0, 0, 1 },
-+#ifndef OPENSSL_NO_RIPEMD
-       { "[email protected]",     SSH_EVP, EVP_ripemd160, 0, 0, 0, 1 },
-+#endif
-       { "[email protected]",            SSH_UMAC, NULL, 0, 128, 64, 1 },
-       { "[email protected]",           SSH_UMAC128, NULL, 0, 128, 128, 1 },
-